Update for LP CAF repos and kernel.

Change-Id: Id39b9a443c85b89c6162662e6a87919c4b9abd48