Using the right class loader for unmarshalling

Bug: 3497767
Change-Id: I68d54f07cd4e65843e90f8f819212798df018acd
1 file changed