Merge "Handle configuration splits when creating the class loader context" into oc-mr1-dev
am: ed54b41e3c

Change-Id: I34d37f77255226ec46bb833b64d8196b746f413e