Merge "Otapreopt: Introduce protocol version 10"