Merge "Be prepared to handle empty class loader contexts"
am: b22ae40038

Change-Id: I9bc934d5d76417441e7f5af8d0013b476795799a