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

Change-Id: I7dfd555ebb0e4037a11ccb7daca640b1a1ce2534