Merge "Statsd MAX now obeys refractory periods too" into pi-dev
am: 3b826c6075

Change-Id: I5741106ec3cd5a5d9c7a66796549982936c4f500