Trebuchet: DA translation

New merges and transition to cm_ format

Change-Id: Ia8b49cb23b9d935c9bbb2393453795da427be85d
Merge "Trebuchet: DA translation" into cm-10.1