Merge "Fix pending exception failure for encoded statics"
am: 34110807ea

Change-Id: Ie0be2f627c540bd22888e3a8e327c8efc23c80f3