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

Change-Id: I60cc211cbcdc457519eeec9e0a038b4ff8c455ea