Merge "Faster unweighted 2nd degree least squares algo."
am: 986678fc37

Change-Id: Ie605928ce72abdae47a47f8cfc0d207875dea971