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

Change-Id: Idd303ab7cdff1b3cf7f57589eee6ad4f8f0ebbb5