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

Change-Id: I6901b1bef8e65833aa77e2d0308ee62b7388265c