Merge "Update to latest version of Roboto" into ics-mr1