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

Change-Id: I326c4f31514ee1e349a5ad6e832a861c9988a701