am 387ffb97: am 100a4f32: Cleaning up unused plugin declarations from the manifest.

Merge commit '387ffb97553ad872b5f9dce6a08ad68044086d91'

* commit '387ffb97553ad872b5f9dce6a08ad68044086d91':
  Cleaning up unused plugin declarations from the manifest.