Small updates to incorporate shellcheck recommendations. Change-Id: I450706b404735f07eef8cf605303363030db16b3