Merge "Revert submission" am: 91770e0381 am: 4f3735c6dc am: 2d6ec086eb

Change-Id: I5f61d477a5c59459664c67adfaec5bce63d27813