Also fix hardcoded root username in multiple places Change-Id: I9b83e206aff694a9b8caf68da2e50b5c34e7ad23