quota shuffling

Change-Id: I56a0fcd5066de8aaf366bb098d61d07d08aa37c4