Merge changes from topic "HfpClientVendorAtCommand" am: 35593c0bed
am: f2fe97bb75

Change-Id: I9670398ee9658ad1c26d353f1951227cbc22f88d