Merge "Move both CE/DE storage areas to adopted storage." into nyc-dev am: cdea85e9a3
am: c9994771fb

* commit 'c9994771fbd3935e75df8f057557858645e2960b':
  Move both CE/DE storage areas to adopted storage.

Change-Id: Iccf6bb9d3490df4bebb2ea21f50cc2295fc6476d