Cleaning up plugin configs and increasing version (#12712).

Change-Id: Icd22ea6b4ed264b91e5d0f57ae379083dece30bc