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

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