Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c  -s ours
am: b1b04dddef  -s ours

Change-Id: I52cfd424753db44826ff7b81cdbb85ffd4358152