more cosmetic changes from android-3.14