Merge "Add support for processing class loader contexts" am: 00cca3a275
am: 5b836edbec

Change-Id: I4d095b288b8664a9e4445b2bec55acd911e43fb6