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