Merge "OBB: Change documentation to reflect reality" into gingerbread