Merge "Import translations. DO NOT MERGE" into oc-dev am: fbc7cc849f  -s ours
am: 9b620f3a60  -s ours

Change-Id: I61a4a2de1285b58eeca8afadd9f9b61bc5b311a0