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

Bug: 169785590
Change-Id: I4d4c4408a928a0b9c9bbbedad9b7346d80a81af9