Merge "Revert submission"
am: 91770e0381

Change-Id: Ic2713b9b8bc4df480faae9d6324c8dcbd2c91418