[automerger skipped] Merge changes from topic "cherrypick" am: c4b647458c
am: 612587f823  -s ours

Change-Id: I9d7661671278cabd1114a370f3b0e360599754e6