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

Change-Id: If2094a3c41fe95b6c5727e65cbd02cb6d88a08d8