Merge "Fix NPE when calling getResolvedBaseApkPath()" into udc-qpr-dev