Merge "Removing deprecated overlay variables." into mnc-dev