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