merging android studio-1.3-release