Merge changes I8449eea7,I24666871 am: 5d8768f2ca

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

Change-Id: Ib5c9d0985bee95bb5ef8a0058bf715bd0c344486