fix after merge

Change-Id: I140f868b70f0cc4afb7cbfb0f93b667eae9d8ab3