Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d1c17d2ad  -s ours
am: 3f1c7d72eb  -s ours

Change-Id: Ibee94f0dd88a4b7873b8347def073b8459613e4d