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

Change-Id: I94da1d7773bdac11b517a604296e2e7862cc9041