Merge "Clean up tuner constants and update according to ag/9977359"