[automerger skipped] Merge "DO NOT MERGE"
am: fe2a27d9a9  -s ours

Change-Id: If772d1fd17bb916f5c373ff3da7fbaab4b72d891