Merge branch android-common-3.10