Merge "16KB: Fix failing tests for AOSP targets" into main