Merge changes Id5f03945,I69c74471 am: 23ae9df08e

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

Change-Id: If6b639632128985911c1fe437771414d76a2dcec