staging: android: things I forgot to commit