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

Change-Id: I375aff2b634f134b3c7fedc3571f79c7786aa9f2