Add wingray and stingray to roomservice

Change-Id: I8cd1955751a44a8a3a7fc488f60b85e36ca91cad