Merge remote-tracking branch 'upstream/master' into ms516
Android Data Collector control flow and usability update
Merge pull request #519 from stowellm/ms516

 Android Data Collector control flow and usability update