SlimISP_JH

Change-Id: I186e293b025334b189da7c0c1ce03fa8f3d82401
Merge "SlimISP_JH" into cm-11.0
Merge branch 'cm-11.0' into martincz