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

Change-Id: Ibde4787eb35c9867c37b4b382f9229882b65a260