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

* commit '331a5767621c3c43daffaec4584618bca1eb719c':
  Fix test incompatibilities with Nemo (watch) device.