Merge "Fix pending exception failure for encoded statics" into nyc-mr1-dev