refactor: Put different os's back in client product Change-Id: I4e8955b62351b2ce0d8ffd22682f727cafd4e642 Signed-off-by: broberts <baily.e.roberts@boeing.com>