Merge "console: Add setenv HOSTNAME console" am: d2c66b31a0
am: 5884f608d9

Change-Id: I0ce00d53c7ef176e920d0a2dc3c9136c20383f3d