[automerger skipped] DO NOT MERGE
am: e4b8995430  -s ours

Change-Id: Ib400b530206442d79a36475ac4b5c6885d685b35