Merge "Otapreopt: Introduce protocol version 10" am: 26311df43b am: 076b5c7a3a
am: 7690741e35

Change-Id: I36083c7251159deb43e18fe885fa4c27c88f9e73