Merge "ANDROID 15 :: VIC :: FLIGHT PATCH UPDATE" into main