fixing merge mistakes

Change-Id: I1b314ec0b940efac64d878cbf4bb2cb17ae4c372