Merge android12L-tests-dev@8941410

Change-Id: I39565ad6a87b2fdd6172675441e012943f5376b1