Merge "Remove USE_LOGICAL_PARTITIONS override"