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