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

Change-Id: I13c4bd4dc53f29b5cd0f073909fb54c9107142c7