Merge "Fix the build errors for samples for WearPlusShared templates in lmp-docs" into lmp-docs