Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 197deb104e  -s ours
am: 34cad9a86e  -s ours

Change-Id: I123683b516c85fa1c3742c96e3362d2bdb1341a3