Merge changes Ibee1fb7d,Ibf914849 am: 1224297379

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

Change-Id: I68ab391ea58c8e3095887351c9b1a71a1276ca2c