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

Change-Id: Id496a1488eccb7d8e15475b1a7a290a7f5e692b0