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

* commit '84c8603da051638b41baabef54bcc0f4cbef9735':
  Improve external storage docs on Context.