[automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours am: 8451b7d01c -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history
Change-Id: I9f6529bd4b719fdb22f5248280c900e384086743
This commit is contained in: