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