am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."

* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.