Too many variants

Change-Id: I53d443dda58c934cff41f66d17db08d8ef6b869f
d2: update to kk fingerprints

Change-Id: I83cccbb6f631c64047235a483c72dacbbf8fda9f
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD