Merging changes from BCH_CHB branch
Merging changes from BCH_CHB branch

smart-classic/smart_sample_apps,smart-classic/smart_sample_apps,smart-classic/smart_sample_apps,smart-classic/smart_sample_apps,smart-classic/smart_sample_apps