Merge "logging: always enable DCHECK for the static analyzer" am: 844940d751 am: 539c87b29a
am: 41ed46f9b4

Change-Id: Ie17cd4eee74856f4052425c2fe7480aa9d96fed5