Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am: 91ad8847ab
am: 74b10b831c

Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2