Merge "Revert submission" am: 0c3329b0dd am: b32ceec7aa

Change-Id: I52626e750b827ef2f6dd9ccfa2ed74e475a28770