am c9966891: Merge change Ibb245ea7 into eclair

Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-plus-aosp

* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
  Return an empty PluginList instead of null for the