Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev
am: 21bc812a25

Change-Id: I2376f1ddba23dfc9cf872082cd7a43164eb0b870