Merge "Avoid updating apex on device that does not support it" into rvc-dev