Bug: 284124708 Change-Id: I2322d8486f147786bddd57ad4ef1bea6a33eb535 Test: just config change (cherry picked from commit f3841c98)