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

Change-Id: I58c03a98b8c117673a7cb99f2efb436b47a76881