Fix bashate errors

Change-Id: Icee255fc3393bad79ca02457395170af42c61a32