Merge "Always use REGISTERED_ONLY when appropriate." into mnc-dev