Merge "Reformat CalculatorResult.java to 100 columns" into mnc-dev