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

Change-Id: I9553a3ffcadd4de2cb5810da78696147f2f062d9