Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev am: cbe9c278 am: 63a9cea3 am: 5dfb8438 Change-Id: I4a56746c9b0ca7bf4695453c01305349cd6f29b1