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

Change-Id: Icbc08f62f6cf69069472880d386bd3fe6011d428