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

Change-Id: I69363e5070e5cb9218075555f69b86a39dbb6d13