Merge "No need to read ro.apex.updatable now"