More fixes relating to merge

Change-Id: I21a27ad20caef68514daaf6125f5e9e3589a887a