Merge "Don\'t update checksum if data ptr is null." into nyc-dev
am: ea14dfea44

* commit 'ea14dfea44b3a7e4426709914d98092ff1db5a5c':
  Don't update checksum if data ptr is null.

Change-Id: I697528ae47654455f07993ff9115a1a576e1edf4