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