Merge "target msm8994: fix liquid 4k boot up failure"