Updates for CM12

Change-Id: Ifc1bc8994d19f2907a63ddecf5bf4f445c352bb5