lolcat

Change-Id: I4fecd80884a86c2d9bb720c9e821bd1605814d8c
Merge branch 'cm-10.1.1' into martincz