updates for cm-12.0

Change-Id: If23093c9d5c113c576360c6c1c7649a321494527