Merge "Import translations. DO NOT MERGE" into oc-dev am: b33c2f688e  -s ours
am: bd940585bf  -s ours

Change-Id: I76e543e80495f30d1dcfffc250a8bb60d680ba4c