[automerger skipped] Merge changes from topic "am-77824143cfe54e8ebd083716dd4fb16f" into stage-aosp-master am: 259ea052e8
am: 71757ccdb8 -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1 05a6543248 is in history

Change-Id: I60381dea904297814f05ac3bd717f5b22c0b5368