Merge "Fix an incorrect description of OOB data field" am: 4074ce1408 am: b7698b65e8
am: 46640177e0

Change-Id: Ia915cf667f860a3e6b7c41294bb36434887866f7