Still correcting last merge problems

Change-Id: I4b1fe4264e8c85f95bb539d7f369c8f477f2bac4