[automerger skipped] Merge "DO NOT MERGE" am: 79c936f956  -s ours am: e0dab2bdda  -s ours
am: 843b510864  -s ours

Change-Id: I930ac029326396ed0950373197b7d28cd298d218