Merge branch android12-platform-release

Change-Id: Ie6539055235e0e0a0b6339566464163c0725bbac