Cherry pick some more tweaks to reduce the change further.
Cherry pick some more tweaks to reduce the change further.

ld3300/ola,ld3300/ola,ld3300/ola,nightrune/ola,ld3300/ola,nightrune/ola,nightrune/ola,nightrune/ola,nightrune/ola,ld3300/ola,ld3300/ola,ld3300/ola,nightrune/ola,nightrune/ola