Merge "Fix statsd crash due to bad bucket index" into pi-dev
am: 7ad26e4bad

Change-Id: I7ca80eda49b401ea3eb2b045f0e6797d640c584e