Change-Id: I9cc4a3d140003de737b81b4dcfa1e4a94d4a2ba4 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>