Bug: 286353167 Test: n/a Change-Id: Ie448325dd8043a3f4e6537183085f636cd959386
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b