fixes after merge

Change-Id: I0d914ef72bd5487368c4457f85272fb741a63417