Various changes to match Android/Google design and code guidelines