Change-Id: Ie6c01ca4fb11b4b4c5e66618c9f8f0cb67e7845b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>