Merge "Declare `ConversionResult` in `android` namespace" into udc-dev