Merge changes I1f5cebbc,I43a031a5 am: 99c24dc5b6 am: 46d947a2be am: df3ab60e7c

Original change: https://android-review.googlesource.com/c/platform/development/+/1376076

Change-Id: Ibcdce568a6217d566236ab5954adf84d3f849fe9