Do not preserve CR+2 all the time This should only be copied over based on other conditions related to the code changes. Bug: 507976856 Change-Id: Ibf8329a8dfca540a023e6395929a2e22b558cd4a