Merge "Revert "Check against LOG_ID_MAX instead of LOG_ID_KERNEL"" am: 2bc8e32242
am: bbb4fa78a6

Change-Id: I7946e677a29570ddbc89c4c60449a225d94acf2f