am e48569a8: Merge "Guard against null Context in attachInfo()." into klp-dev

* commit 'e48569a87057e46a30d3dcbb2d788a4e4da7f21c':
  Guard against null Context in attachInfo().