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

Change-Id: I6c7a2be0da156cede075f35209033980f7deeda0