Merge "Add Developer Options string to xml." into tm-dev