Merge "Merge \"Add a flag to toggle how much the storage manager should retain.\" into nyc-mr1-dev am: 7374971c28" into nyc-mr1-dev-plus-aosp