am afa039c9: am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to...

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

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