d800 part 2

Change-Id: Iacb33ff06c2d648fcc2a01b75425e1e1f921af3f