Update kernel to fix the breakage caused by P merge
am: 529c736eb2

Change-Id: I87f8b8aeab2f42e3798e7ee761375834936e8163