Same as CL 77435, but without the default singleLine value change. Change-Id: I04794ed72716bbe5a285d2bbbb3f536308e5972f