Merge changes I48e62f25,Ib04e80e8,I3878abfd am: 0cbc6e8119

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

Change-Id: I093ca9a65921661c9ce7e0d099d4d93cf20d2cc3