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

Change-Id: I46fe0cc5710e7adb082a3684fd6cbc524560e5ea