Addr rhine and togari

Change-Id: I65bc468ad91472801adadb3654a686cf862765d8