Merge "Remove unused Console#getConsole" am: e910467c02 am: af3510e247 am: 7f958830fa
am: 285ca5fccf

Change-Id: Ib1519973986576d16460ff0e7c3746fda996b978