Merge "Revert "Fix region space when used with SetLengthToUsableSizeVisitor. am: 69ddc6da" am: 905ae750 am: e3abb39e" into oc-mr1-dev-plus-aosp