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

Change-Id: I0d6055f7c055b4d841e02945d30074ce898aab5e