Merge "[automerger skipped] Merge changes from topic "statsd-allow-bytes-type" am: 783ec049 am: 393e1ba2 am: d090104b -s ours"