Merge "msm: ultrasound: add support for proximity"