[kernelbranch]

Change-Id: Idacf7ef522894f1d0266017d05e5cd31152fc5d6