Compatibility updates for CM11

Change-Id: I674afc6664e5c51be875d27d161f1cd899326b07