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

Change-Id: I78ef18f0510a07946329253ecf3c3aae0ab489cd