Merge "Revert submission"
am: 85fe6364a7

Change-Id: I907e81baf767ba657920490fd4d32a7205cb6690