Merge "Duplicate apk names on package update." into sc-dev