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

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