am cd95597f: Additional changes to support controller refactor.

* commit 'cd95597f2dfc0760a105a87d16664e56ca1a4afe':
  Additional changes to support controller refactor.