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

Change-Id: I14ded4a01c22b6537f5f472532af795e4123b1a4