Android CTS 7.1 Release 7 (4120758)
Merge "Avoid shifts of negative values inflateMark()."