Merge "Revert submission"
am: c099ce8af1

Change-Id: Ifa4c5c550fcab2ae9f862aa14fd5e2aa0bd7d7e4