Merge "platform: msm_shared: Fix issue with clear feature implementation"