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

Change-Id: I8741b017d9189f81c4a2436b26182bd3502bf9ce