Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c7d9045105  -s ours
am: 651cb9ec20  -s ours

Change-Id: Ie35ab0514caa65270a0e53fbde8f5de3c0a920de