Test Android Studio integration(ACL)
Merge remote-tracking branch 'origin/ACL-1-fix-code-review' into ACL-1-fix-code-review
Merge branch 'master' into ACL-1-fix-code-review