Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1b9eecab0  -s ours
am: d99cb52b17  -s ours

Change-Id: I276d2d4cc8f8c2b52b32dfd3c8d1db385c1f0639