Merge changes I48e62f25,Ib04e80e8,I3878abfd am: 0cbc6e8119 am: a02aa2e914

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1475323

Change-Id: Ia8f440791106af5e22f192de3614e2f0e48ae048