Merge "Fixed a small sizecompat check"