Merge "Include non-zero dimension views in excess space calculation" into mnc-dev