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

Change-Id: I69786ff4810ccf8b625832382d9f752b5811ba99