Merge "Rewriting should fail when any paths are null." into mnc-dev