Merge "Make changes to CARSM and BRM for multi-hfp" am: cc2b17ae99 am: ebf50e504f
am: e2627aa5d0

Change-Id: I9f821d4f54e23128a84f1fb8a93c6cdf04ca3e9f