Also adjust some thresholds for noise level setting. Change-Id: I7e03d7057ef2061c9447728deb9c6aff5d3da4b7