Merge changes If4e8ff72,I53d861fb am: 91496f424d

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

Change-Id: I094abfbc7f674bff0b146a60b37193b9810040db