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

Change-Id: Icebf2c5392cd79d0f8677452b04945507c92597d