Merge "Fix build when #define LOG_NDEBUG 0" am: 1b4c5978d1 am: 5a21680173 am: 2a20c4c33d
am: a6c2a013cf

Change-Id: Ib30efedd2d739cf6c7ae3964d6109f3a256e0deb