Fixing merge issues

Change-Id: I4053134e5a7ef85185d27abbd04e75dd4552b461