Related-Bug: #1390392
Temporary fix to have stable build as some of commits didn't get through
Zuul

Change-Id: Ic63a60174e913955110d09051f101ece52fb9263