Preserve order of plugins taken from config

Change-Id: I8b440510c65741af3397fbe62f51513685b4707b
Merge "Preserve order of plugins taken from config"