Merge changes from topics "cbs_area_info", "subscription_id" am: 361cae3630 am: 3f01e13713

Change-Id: I90ead187a39bf79e66c93184066bd467ef291d71