Merge "Import translations. DO NOT MERGE" into oc-dev am: c393596c5c  -s ours am: e1e9f796a0  -s ours
am: 52bc57e1e5  -s ours

Change-Id: Ie711f4391d77c6e482638c062bfd365893fdc96e