HTC Oneses

Change-Id: I1882096af27efcb8731d0e51a0b8a053be0f2056