am bbeed672: Merge "Fix ALOG_ASSERT"

* commit 'bbeed6726cd11a0285a59225605c4ae33ee25257':
  Fix ALOG_ASSERT