Setup script fix

Change-Id: I29c5b30e475908bfece71cae7d53576ef1fa4b3b