Merge "Add a few missing asserts" into mnc-dev