Bug: 253288064 Change-Id: I75d7a2e770209359a3ad76107a81035f6821a052
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b