Merge android-msm-flo-3.4-jb-mr2