CQ: 18321 Change-Id: I49f47748e7753146c0d696b2bd381d2d3465691e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>