am 10fbef23: am 18d25783: am ab90447e: am a8e55d27: Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev

* commit '10fbef23fd668b18947f0aafcf13f91f3336f168':
  Fix test incompatibilities with Nemo (watch) device.