Merge "Import translations. DO NOT MERGE" into oc-dev am: 69fe3e4678  -s ours am: d1be7b6f73  -s ours
am: 31ddf15a42  -s ours

Change-Id: I4468299006ad777e710b1ea8ae2877d102020f80