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

Change-Id: I12f360c0f8de184134a750fb4051c075a6cce5c3