To fix the build hang issue
Set Controller.Testing=true so instrumentation dialog is not activated
Merge pull request #1105 from monikaprabhu/ChocoButter-2Become1

To fix the build hang issue