To support Pixel targets as well. Bug: 242961282 Test: manual Change-Id: Ieab708c42fec9ae488c47e8302fb01d6175c0550