Clean up for code review
Disable dry run by default in demo app
Revert "Clean up for code review"

This reverts commit a5c4aa9ba9d13c9fd9ef890d38f83bcaa5bcddf5.
Merge branch '2_demo' into 2_demo_apk