Android CTS 7.0 Release 17 (4486155)
Merge "Avoid shifts of negative values inflateMark()."