synced with latest changes in android-store