htc 8960-common to us

(cherry picked from commit 1d3370b0562fbe602c2a58098e2c25ad7faef6d2)