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

Change-Id: Ibf1a89cbce8ae12aad5907800f2ce60da2fe0e5b