am 1a3ccc88: am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"

* commit '1a3ccc881f451ff733a587b9fac8d73a83c12dfd':
  GOOGLEGMS-749 Fix integer overflow while applying block based OTA package