Fix bashate errors

Change-Id: Ibc36d67df85feb945934d1022f5336d430d7f33a
Closes-bug: #1399099