Merge pull request #505 from bhariharan/unstable23

Merge branch 'unstable' into unstable23
Refactor the activity instrumentation test cases
Merge pull request #506 from bhariharan/unstable

Refactor the activity instrumentation test cases
Merge branch 'unstable' into unstable23