[automerger skipped] [DO NOT MERGE] Handle edge cases where input or hash/data could be null.
am: 35664063 -s ours
am skip reason: change_id Ia91ea822ee2147b2a2d14bea250a708e8c10bae4 with SHA1 c5c47628 is in history
Change-Id: Id9b2eaf4160eca3ef239a99c3374b57f7ac41e31