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

Change-Id: I9a28b206e9d57af5832d9338570baa9732e4c581