Merge changes I1b8e0272,Ia07d0d3b am: 30c1fd8055

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

Change-Id: I08c229fa40532c7cec76637fe22bf9ecfc90f2e2