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

Change-Id: I16208b14efe6ca87828ef031146efc89618b709b