Modify Script to suit new Branches

Change-Id: I00e0e0277d719c92198719a17d698d16fcb9f26e