Merge "Fix bug in BCE remainder handling."
am: 6d525fd408

Change-Id: I36ba378bd2973ac7223a75a59fffa733580049de