Merge "Revert^2 "Set use_vendor to false for media apex""