Update branch for encore kernel

Change-Id: I35c3e835ec16c87a952cd9798ca8db3fb92a3e4c