Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9dbd07ef32  -s ours am: 87ed2a3a15  -s ours
am: 0a4c07d372  -s ours

Change-Id: I89861002fa49c558fab5ab7e3dbfb3c94181697d