Merge \"Merge \\"Add a flag to toggle how much the storage manager should...
Merge \"Merge \\"Add a flag to toggle how much the storage manager should retain.\\" into nyc-mr1-dev am: 7374971c\" into nyc-mr1-dev-plus-aosp
am: 5fdb94ce
Change-Id: I30188ebb95237cc3fa43533d1b5c1df08f8cf4dc