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