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

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