am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1

* commit '0fc225ed37ec535ff9b5238f390a79dbaf7f377b':