Merge "Add stored class loader context option"
am: 49720a09e3

Change-Id: I231fcaba3d3e3120780cc46bc0511173af9acd54