Merge changes Iee0932b5,I0d77c490 am: f8cd69af8b

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

Change-Id: I098b877a54f1f29475863019f8c4dd9f27638d06