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 '08e714c3a7bac3ca1a4f78c769010b1328f9ca53':
  Ensuring that we don't try to use and propagate null activity labels.