Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 42203f5f7d  -s ours
am: 7368d83a98  -s ours

Change-Id: Ia228b429035e6df7fc477a3a09fd45e3a2c4f3f5