Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 68b49a3a8e  -s ours
am: 89f435f73c  -s ours

Change-Id: If521a5f2b95d61430a8403080688e517711636d2