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