CM Changes

Change-Id: I1a296b66934e0d273cb3c8b035fbe3bb4e2608aa