Change-Id: I42ccd2d4bdc79bbc4bd1faf7450af1b608a17edb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>