Updates for cm-12.0

Change-Id: I2052c020179bc8cfef810ac10d2524321ddbfc0f