Bug: 208386762 Test: Build pass Change-Id: I65a71c8c8501e0bb25b5ee261399c668aa532f99
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92 No-Typo-Check: based on above commit Bug: 202250383 Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b