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