Merge changes I60f883c0,Ie5955865
am: 8c3e940324

Change-Id: I97b92d3ea89bd81798ec1ca0859197617970069b
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: 3eaaa508e91e6f34f645d0a82ffb8d2eaa15db40
2 files changed