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

Change-Id: I0c69d8b4573e6a482574cf9930c8d7a45367a272