Submit for jiajing

Change-Id: I67c8c14c36d4cb03245a905514a79503505598be
Signed-off-by: Chloe Xu <chloe.xu@sap.com>