Merge "Cleanup properties" into mnc-dev