Merge "Templatized BasicContactables Sample - Base Template" into developers-dev