Merge "Revert submission"
am: 3b98950a2c

Change-Id: I95033e9dfec9df02b9b21a2e9b67f7d0f9cd7225