upgrade pipeline fixes

Change-Id: I3eccbe1e18a950084047bbdb618cfdfdf3c868b0
3 files changed