fix after merge

Change-Id: Iba8c8cbdda4297331afcd14d70f7df6707263f48