Merge branch 'android-msm-floral-4.14-rvc' into android-msm-floral-4.14-rvc-qpr1

Bug: 172326712
Change-Id: I3e75a48d2d5a549867195a771626776459acfdcb