Too many variants

Change-Id: I53d443dda58c934cff41f66d17db08d8ef6b869f
Merge branch 'cm-11.0' into kk_mkt