AOSP has abandoned us now, we may as well make things look a bit prettier. Change-Id: I09f48ae1b565f05b0ac0ae6bb18a4a2100402e45