Bug: 202113218 Test: manually Change-Id: I6d22935ff2ddb7325cf4f946ea4a71e625427d86
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b