Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 497bbfd9ac  -s ours
am: 6ab6643d3e  -s ours

Change-Id: I18094c4478691bb3709222a945b304b0c9dc73fb