Merge "OOB generateLocalOobData"