And update the baseline config. Bug: 72710440 Test: manual Change-Id: Icc37d1d688d3788e9c9e98a594b9532889ffeea9