Merge branch 'cm-11.0' into martincz
MoKeeLauncher: bringup

Change-Id: I8dbbfcaef5d1c45a506e5a6f13ec6f8701f934ae