Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
am: 565cab11ff

Change-Id: I11f2a6d1df31d1a27ce5295bcdf6fbbd540060bc