updated scripts (misc changes)

Change-Id: Ib4a75794769c4aaaf155718cb9f1151a1ef4266b