Merge commit 'fix integer promotion bug in partition size check'

Change-Id: I4081917b46013fa8f4218cade8bd12cb2d013aee