Merge "Do not call update() for read only APNs." into oc-dev