Merge "Merge "Copy ApplicationInfo#versionCode field" into pi-dev am: a4d6570b2f am: d5160491ef"