Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev am: cbe9c278 am: 207d5759 Change-Id: I86db877e696594e854a77bea18897f63695cff5c