Minor changes to make the bash8 check happy

Change-Id: Ic3fd85ce066cd9b15fec95316afe38974e8f19cb