Merge "Add support testMode=false since KM RPC version 3" into udc-dev