[automerger skipped] DO NOT MERGE am: 99d9f8b320  -s ours am: b49e3595b6  -s ours
am: bcd7bbf07f  -s ours

Change-Id: Ia7b73f590c7a2836d46ee42b47ed70634f52c562