Fix bashate errors

Change-Id: I0bc91817787a95a04eb3f951e4e2067192ccd67c
Merge "Fix bashate errors"