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

Change-Id: I6df1ab7cad6ee388455e7d417a1967375470c5db