Change-Id: Ib889d1d8269a8c58edc12b688360b94a0b4bdedf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>