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

Change-Id: I5c7c636e60cde0b865e0392b2c6e024a97887449