Merge "Add fs_mgr option to enable/disable quotas."
am: 3b261ace57

Change-Id: I63957616da4017af4bd386c676876931f98926fe