Fix pending exception failure for encoded statics
am: 5464c73567

Change-Id: Id83316ec538a13bd70e77b669c60ba37ee76d4ea