Change-Id: Ia96963b90788250b4bc6bc89c2bb697de103535f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>