Merge "Transitioning identity to external_libcppbor"