Merge "Revert "Changes necessary to support SEPARATE_NOBITS_REGION feature"" into integration