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

Change-Id: Ie2d1ab2e79d0d3cc79815da7af4022e58838e5cd