Bug 1353931: If quota value is set to None, then return default

Change-Id: I0ea900c6f3deda213500270c1d16992467cf562a
(cherry picked from commit 2c2ddb1e43a91afe84af5440b5a2995b8daacb0b)