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

Change-Id: I259e7c0fdd800a917bde1929809346ced80448c2