am b513fe72: (-s ours) am f87aecff: Change kernel path (do not merge)

Merge commit 'b513fe72793634a65432b51ddbde405d9ed59e6b'

* commit 'b513fe72793634a65432b51ddbde405d9ed59e6b':
  Change kernel path (do not merge)