Merge changes from topic "statsd-allow-bytes-type" am: 783ec04909
am: 393e1ba2e2

Change-Id: I2840072c4986cc0fb5ed4a79b0bfa7994bcc1448