Fix Jenkins post-merge build
Fix Jenkins post-merge build

Change-Id: Ifa4506c82305fde83865899dba2cef30599aed77

cgi-eoss/ftep,cgi-eoss/ftep,cgi-eoss/ftep,cgi-eoss/ftep,cgi-eoss/ftep,cgi-eoss/ftep,cgi-eoss/ftep