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

Change-Id: I428392f851d6590a3abc1247537fe3409a3b64ab