Merge "Add arg for overwriting class loader class path" am: da5cbc32b8
am: 1b1c1d3820

Change-Id: Iff276f84ee8347055c0dddaac787e3384d8bf3a4