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

Change-Id: Ic27a992cdacda04a5b62d01de44cf1b92164e58e