[automerger skipped] DO NOT MERGE am: 2244bd112c  -s ours
am: 0de27c555e  -s ours

Change-Id: I8bab5ba4461d4a93b7b64e7db39b30bc3c7d620f