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

Change-Id: I180a103af4806a7132714d0bda3fe619fc806076