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

Change-Id: Id5d81ce0db040a0e9dc62b9b1f5b604128c7520a