Merge "Fix coretpk upgrade" into tizen

No match.