Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d1c17d2ad  -s ours
am: fde28ca6e5  -s ours

Change-Id: Ice5d70132507e8f1055bbbe365eee98a36f2bad4