Porting to d806

Change-Id: I172fdebe6a2ba73761049d78e45e682454ebbbcd