Merge "Fix benign integer overflow conditions for VSYNC add and removal."
am: 34efca1644

* commit '34efca1644412505079d8610e1f6365bfc03c505':
  Fix benign integer overflow conditions for VSYNC add and removal.