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

Change-Id: I053e082c034f33ef79aa42afc0e7bf04f6454cc2