Merge changes I1f5cebbc,I43a031a5 am: 99c24dc5b6

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

Change-Id: Icf16ea6295a500db1ae07a55922b62d7ff457bc5