Merge branch 'android-version-1.7' into android-master
Merge branch 'android-master' into android-version-1.7