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

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

Change-Id: I212b15b282a179db9b852bcfad061d8f4830f6fc