Merge "Allow the assistant activity types to be snapshotted" into pi-dev
am: 8512aa4dda

Change-Id: Ib46302f295ccc201f70875df3334bd8b04d2fb07