am c56b26b8: Merge change 6997 into donut

Merge commit 'c56b26b8b0425fd8f27b381d716408b64f43699e'

* commit 'c56b26b8b0425fd8f27b381d716408b64f43699e':
  Rename IActivityWatcher to IActivityController