Merge "Add Enable16KbTest to TEST_MAPPING" into main