This adjustment is still experimental. Bug: 7165399 Change-Id: I3fcf361933995d02a5329eeaec80155b39371ba3