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

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

Change-Id: Ifcf99c3c60b0ef68e1262afb0a5d0943d039ac67