Merge "Align overflow properly. b/16984437" into ub-gmail-ur14-dev