Merge "Mark updatable APEXes"