Merge "Deprecate Data Command in Android"
am: 65943dbc41

Change-Id: I9f4146d9de6cd7c88d6866105b3acdae9d09f334