Change-Id: I652f1b08439ff7bb0b7b5b21459edeff31017e5a
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>