Merge "Propagate exception thrown by ContentProvider.canonicalize" into rvc-dev