Merge "Post-O: skeleton for product configuration support in CarInfoManager"