Merge "<kernel> compat check can be split"
am: 34168f34e0

Change-Id: Ib1e2bc26efc6de3393a8dc0bfff6bec68119bd6a