Merge "Revert "Deprecate Data Command in Android"" am: 609f65048f am: 81ca5f3ee8 am: 77420b1a37

Change-Id: Idf45a7251f6a62912d92ac6ffb89efd789724fea