Merge "Fixed bug in APC rate limiting fix." am: a3c549fe9c

Change-Id: I80195a6c87be2e2f67fdea7ad608c92369e9dcda