Merge \\"Check for null activity before getting dashboard categories.\\" into nyc-mr1-dev am: 7b03ae69df
am: 8847c70b61
Change-Id: Iaa95737f7ee6bd086b6510619201d011d8a487a0
This commit is contained in: