Change-Id: I95ed943638895b718862f05e3f706dcbef4c6a7d Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>