Merge "Fix ALOG_ASSERT"