Apollo: DA translation

Final staging merge

Change-Id: I33b4d738e83e221cd0071184f313049ad6f9a656
Merge "Apollo: DA translation" into cm-10.1-staging