Merge changes from topic "working-set-tol"
am: f54517c907

Change-Id: Idd8cb1b8e3560bf069fac1703d11b3bdf43e2d9a