Merge remote-tracking branch 'google/android-msm-mako-3.4-jb-mr1' into jellybean
Merge remote-tracking branch 'google/android-msm-mako-3.4-jb-mr1.1' into mr1.1-staging