fix script issues
Change-Id: I863555a114ac66ea522741ea87bba939efca72e8
Merge "fix script issues Change-Id: I863555a114ac66ea522741ea87bba939efca72e8"