[automerger skipped] Address comments from aosp/1284557 am: 5217786c6c -s ours am: 1f57850f7d -s ours am: 4d68cddac2 -s ours
am skip reason: Change-Id I5edbff1d7eed2f939ba26f1ebd7ead49ac67b978 with SHA-1 2cef9f7da5 is in history
Change-Id: Ic23c00b983a7bafc5dfb0260e586ca6685379527
This commit is contained in: