Temp fix to allow new kernel headers to merge. am: 1ab187732d am: 78e1245ede
am: 134a34cebb

Change-Id: Ie52ac0451f42778b5e676f93ac954c90dee45840