Merge "fix static-analyzer logging/CHECK macros" am: 01e7990a10 am: 951d7e953e
am: 543f2c68be

Change-Id: I42431a5908b7cad199d4c23dd908de561245b822