Merge "Revert submission" am: 85fe6364a7
am: c1b2832012

Change-Id: Iac752e7a3f5d14c774c98ac50607d7f7ed9bf3f2