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

Change-Id: I6b959b5d5617c3fac0b8583c7e4c64771c294c3c