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

Change-Id: I95de805e4f8decbba7ab5f18278d97a13d064eb9