Note: we already had picked the internal v1.5.1 patch for the security release, but we still do this merge to make git merge happy again for future merges, and also clean up a little bit of UI things that I did for that patch but abandonned later. Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e