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