Change-Id: I727abe8d93863c925fdaaa62eaf75a752e6b7030 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>