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

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