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