Fix rebase to master

Change-Id: I697334a821126488edcb5aa6613a569b071f592b
Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>