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