upgrade script changes
Change-Id: If5d652ac5cd4627545692d3470b2a65a3b26e367
Merge "upgrade script changes Change-Id: If5d652ac5cd4627545692d3470b2a65a3b26e367"