Merge remote-tracking branch 'android.googlesource/android-msm-mako-3.4-jb-mr2'