Change-Id: Id42c285ed4f31a5a1ad0288166fecff4ac630561
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>