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

Change-Id: Iece20cae94ff7b8b93b801f37366bfc0a89d1c41