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

Change-Id: If6c1b5c77e11f03a1a1bca8fd0ae5982fceeb7ce