Improve the offsetTopAndBottom workaround

BUG: 21413554

Change-Id: Ia0f624ca05f80e3c2949789b448820413ce2e99e
1 file changed