am fdeddad8: am 08e714c3: am afa039c9: am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev

* commit 'fdeddad86776664f0070057749411e479522681d':
  Ensuring that we don't try to use and propagate null activity labels.