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