Add messageId null check in persistIfRequired.
am: b12b703017

Change-Id: I4b04e27d736e3e44537f0f2168f395c4fc01e7aa