Merge changes I8e44ba77,Ib8b933fe
am: 8e41582c8d

Change-Id: I1a122365e2d007689dd70fbd021acac66e171ff7
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: e077b45898cde2afaf5e2ed7fd4f6486fa007c1e
27 files changed