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

Change-Id: Ib990ecea8744c4291cb23b9bc0e35601d02ec869