Merge "Don\'t update checksum if data ptr is null." am: 3b8e0b2cb6
am: 243418258f

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

Change-Id: I13b04b0fb7d3d3f5d4bfd7a1f79549a82b06e647