merge fixes

Change-Id: I6a0fc871c19d6cb7d673cc3fb4ab351db5fe4555