Merge "Improve comparison of fractions" am: 0517cd144f am: b7cdf14a1f
am: 8a0098befe

Change-Id: If5e59001e02555aca6d3520fa4ecd7f42eab5506