merge fixes

Change-Id: I0d7eda4b180e45d43ffdb30689380a1f3100ad21