Updates for CM12

Change-Id: I980c0ba0a13a74f3a28fd4ad685467f085c2aa31
Merge remote-tracking branch 'cm/cm-12.0' into HEAD