Change-Id: I49c9b7e29ee437d1fc92a950ec67a7bcfb9f4b23
Added acitivity type enum and updated relevant classes.

Change-Id: I9981abf09499aea56b58a56f0bcf0a26292ab2cd