Merge "fix warning: Null pointer argument in call to memory comparison function"
am: ce07b6fa4f

Change-Id: Ida2150c0640ff30fc694c6a84c3777eaff906a7c