Merge "Workaround for class loader issues in verifier."
am: 33ff84499a

Change-Id: Idbe6aa9c27ffcd607e90cee864301820fd75403d