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

Change-Id: I36a9c6ea813894d6b0f49dd66fcaea58c0104752