Now equal to the default in 1.40 - 01aec63c Bug: T328497 Change-Id: Ibe7c9b81269a4d31fe26930b912d41191c1ac9ab