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

Change-Id: I74caf251d866c769f85efca6d5d23b2aae06bcb3