am ebb0b03e: am d424b8d9: Prepare for a new IActivityController method.

Merge commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57'

* commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57':
  Prepare for a new IActivityController method.