Merge changes I8141223d,I54182d7b am: 96ee7c1ad7 am: 238fc85553

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2038254

Change-Id: I123e0388b99c5f52b664edff58b25566aaf48984