DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3  -s ours am: e1257bad6e  -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074  -s ours am: c995780ded
am: 10d3ff2004

Change-Id: I6b01dd2fa72261126be178f521c74576e6221f0e