am 60b0846f: am c4d7fc10: am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev

* commit '60b0846fc2be8ba462bcfa535cbaced6c43e532b':
  Changes callback to a WeakReference in ActivityContainerCallback.