Merge "Mark updatable APEXes" into rvc-dev