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

Change-Id: I3cea2fce6e2f15b6a2ad3c428f667f68fcefd325