am 58c78725: Merge "Use activity as context." into lmp-mr1-dev

* commit '58c78725bf6cd5b5dad15d23eb62df5d04d1db75':
  Use activity as context.