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