Merged with last AOSPV2 kernel.