Bug: 210927949 Test: manual Signed-off-by: Yung Ti Su <andysu@google.com> Change-Id: Ie1e4537176f6df53780f258cd9924913df476f50
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b