Merge "Workaround for class loader issues in verifier." am: 33ff84499a am: 6417961ff0
am: 3b74681eac

Change-Id: I6d083b7c90164187231f7be492418b1ad48ac062