Make quota sets update type handling a bit safer

bug 1238949

Change-Id: I8d3ba10f55c272e0e45466d9b2db7a842e363da3
Merge "Make quota sets update type handling a bit safer"