vigor:  kk updates for HTC Vigor

Change-Id: I2b9e9f213e9cad6d4c9817dd99ffcbc07a0e852b