Merge remote-tracking branch 'aosp/android-msm-flo-3.4-l-preview' into android-5.0
Merge remote-tracking branch 'aosp/android-msm-flo-3.4-lollipop-release' into android-5.0