Merge changes I9b3f4c11,Ie51c4933 am: 49bdcae508

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

Change-Id: I8008e73bb123ff76747bad8268bee8a1179ee9c7