misc: Reconcile with HTC one google edition source

Change-Id: Ida2228fbfaf514d4e351ef35c139d529f2bbd93c