Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am: 25937550af" into oc-dr1-dev-plus-aosp