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

Change-Id: I73152bb77e0c4f57e3546e72708fb4fd68fbf59e