Merge "Merge remote-tracking branch 'common/android-3.0' into msm-3.0" into msm-3.0