am 9f81a1a4: am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev

* commit '9f81a1a49c4ae01fd815a5ee801764b1362b242e':
  Improve external storage docs on Context.