Merge branch 'android-msm-pixel-4.9-rvc' into android-msm-pixel-4.9-rvc-qpr1

Bug: 172326304
Change-Id: I323d3c83e0353d6d3a65f53a17b0e2a1e74b03c6