Same for previous commit

Change-Id: Ib7fb5822cfc117642a0638db6c877ca9ab7cd5ea
Signed-off-by: Andrey Shamis <lolnik@gmail.com>