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

Change-Id: I33376d8cca09cdcf6c0aa67e91817e4b095ef14a