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

Change-Id: I56c2597e3f90d9b65ee0f7e8ce3eb7980175bb25