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

Change-Id: I0fd662fb819fd661c068533a6ab86bec4a336ac8