sync from b/274402819 Bug: 279708249 Test: manual test Change-Id: I25abe33ca6212d79a7055906b93d85a2af38935c Signed-off-by: Robert Lee <lerobert@google.com>
based on 84d60a2e19d4ad09086067994d2f683ff86f6231 Bug: 263919239 Change-Id: I7be43786325116baddd35e182f87ad15fbe1a6ce