Merge "Use 4 thresholds instead of 6" am: fdebcf1ae2 am: 00fef4fb3d
am: d16720459d  -s ours

Change-Id: Ie29384e3f86c2deb462fd9503d0950d729d3a5b4