Merge changes I36beff43,Iab7275b9 am: 503e12a866 am: 4d21078ab9

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

Change-Id: Ibc02cc4e8879b290f5826f691a21f8bf400cb291