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

Change-Id: I3f620ab28867fff2f2aba713e9031936e965c68e