Halo Cherry Pick from Paranoid Android