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