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

Change-Id: I69de7c0e5afd8bccdc46c32b39b142327b68e66c