Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b

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

Change-Id: I18cc97ec071980725514785aafdd7927821410b8