Merge "Fix pending exception failure for encoded statics"