m7spr fixes
HTC One cleanup
Change-Id: I27887172ef534ec0e472abcc3281534791792456