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

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

Change-Id: Ib05ffc80702c67b9e0b087561668af1dde341eaf