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

Change-Id: I3f0bd58588ae4d52e16b14a49a9ff869a156eaa7