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

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