Merge "Copy ApplicationInfo#versionCode field" into pi-dev