Merge change 2805 into donut

* changes:
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE