Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours am: bc1a0265c5 -s ours
am: 34d159fca7 -s ours
Change-Id: I63a6c314846d2dcedd1cc1d8477c55aece9b3bc3
This commit is contained in: