Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 907664bb3d  -s ours
am: f83a6ddc56  -s ours

Change-Id: I1d4fde838dd8bb268decc7f5f92485983099fe0d