[automerger skipped] Merge changes from topic "statsd-allow-bytes-type" am: 783ec04909 am: 393e1ba2e2
am: d090104b51  -s ours

Change-Id: Iaba6f76b5caa772d9adb24421ec5787d4dd41494