DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e.
am: bfe4b5edb3  -s ours

Change-Id: I52be163235ae281a263e75ae499b39e44e9f880f