Merge "Ensure loaded plugins are not copied."
am: a9a74666df

Change-Id: If8ac45deba55594a898ad197e370491d4b863990