Merge "Use 4 thresholds instead of 6" am: fdebcf1ae2
am: 00fef4fb3d

Change-Id: If6f8e1f938298506068d87e008ab0de21b8ff6a3