Merge changes Id5f03945,I69c74471 am: 23ae9df08e am: cc37c07a8b

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

Change-Id: I0a07c2b4a591de96148f2786ff0f9668fe313d1d