g2: mach-msm changes
g2: mach-msm additions