[automerger skipped] DO NOT MERGE am: 5ad396f589  -s ours
am: 6ce201f463  -s ours

Change-Id: I60d2bdbc527ffb4b122bd692115c3392f5f3dd04