Merge "Revert submission" am: d7b9321580 am: c41d9e25f3

Change-Id: Ib6fccfa9577665ddc293c7ef70de6163e1a9fcec