CRESPO: Fixes for CM12

Change-Id: I7ae00a4f62f8642f0897ede404dc2430ab097cf3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0