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

Change-Id: If8b24eb54799e490aeb87843d11a5e0a4193a7ce