Merge branch 'fix-snippet-exception' into integration
Merge branch 'android-cmd-line-options' into integration