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