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

Change-Id: I0ea900c6f3deda213500270c1d16992467cf562a