Merge "Fix incorrect proto apk loading"