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

* commit '8a1c30a0b5451973e553944179ddf7513ccc6736':
  Use activity as context.