Merge "Check against LOG_ID_MAX instead of LOG_ID_KERNEL"
am: 9fcabf739b

Change-Id: I6a07a22d727e2e5a886bf6c717d787273feb3226