Merge "trim packagename if sideloaded, get versioncode" into oc-mr1-dev