Merge "Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader()." am: 0695cff3dd
am: 36b3869e2c

Change-Id: I2a7d3a865dce40cbce0c2b345b8f489a8e4a7e3f