Merge "Revert submission"
am: d7b9321580

Change-Id: Ie933df49af0eae974f657e383ef3921e1846936b