Merge "Unsigned Integer Overflow in transportDec_readHeader()." am: 93e981d1e1
am: 11e6511470

Change-Id: I2e93dbf3792b0039d36d882e66007cf251fc15ff