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