Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e916c1a05f -s ours am: f0f1bb9ca0 -s ours
am: 7e9f72e342 -s ours
Change-Id: I4a75544bea23b926d6abcf1cd6486c2a571c38e0
This commit is contained in: