Bug: 322044968 Bug: 321712825 Test: config change Change-Id: I63a2bab8f1dcb5b12276adff7209a9a2a7aa0317