update for aosp KK