This command was deprecated in 16.0.0 and can now be removed. Change-Id: I980352415a2d812725d53d46eb968abbf443b6b7