am 1f2361e3: merge from open-source master

Merge commit '1f2361e3ca93e7047cfed0901361c192dc64342e'

* commit '1f2361e3ca93e7047cfed0901361c192dc64342e':
  Replaced /sdcard with Environment.getExternalStorageDirectory()