Fix overflow visibility logic

Change-Id: Id9235c6946a402841cbd8512b118daf8b1be3c49
Merge remote branch 'cm/cm-10.1' into cm-10.1