DO NOT MERGE: use flar's kernel for now

Change-Id: I8b5499e13898e2f26ffbebc5a7a28e37f027aa55
Rebase

Change-Id: I0d929da579146d037c4a01aaeb4185129ee113bc