Make script work for F17 and F17

Change-Id: I3c8dea5c88f2b918771fc4d10ddc04d8d75dc3c0