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

Change-Id: I25e99afd10fae8e7c0ac06e00e089a28ea7bb37d