Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f5bc976699  -s ours
am: 781afa3a89  -s ours

Change-Id: I56cfeb9a52656ca69317b62d350521a2251b3b0d