am f7a18c7f: Merge "Null check for buildItemFromData" into ub-camera-glacier

* commit 'f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d':
  Null check for buildItemFromData