Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev