Merge android12L-tests-dev@8941410

Change-Id: I0bd66fbfde7709e8640b063fb7ea47093db7d24b