update for cm-12.0

Change-Id: Id1a6823a8e9428794d5ae3f134e508493022afab