Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9d2e819639  -s ours
am: e3a8c0be09  -s ours

Change-Id: I6389ecd3168bb0471b838b5550b88bb21bb3463a