merge fix

Change-Id: I4e2e0a7988ca627975f39cfd0cc8b5a97ebf3601
another fix?

Change-Id: Ib26de45cf478513bd1c85b3bc808c16a92b27be0
last one

Change-Id: Ic27bf19fa2112a6097c765ac5bd98924ba303afa