branch update, hardware_msm7k