Merge "Otapreopt: Introduce protocol version 10"
am: 26311df43b

Change-Id: Ia2e69f6f78b24ae9fd52485d959551a9be6f133a