Merge remote-tracking branch 'master' into local

* quic/master:
  Revert "platform: msm8996: Enable write back cache"

Change-Id: I9ad03e147e816602790347ecac67dd41bae6496b