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

Change-Id: Ib4a72c08706ff417add7e3a3eaedb137ac2823ac