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