Merge "Fix some VVM status issues" into mnc-dev