Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1c5bd422fd  -s ours am: 26cd97011f  -s ours
am: 88c8ae361f  -s ours

Change-Id: Ie4838fa7e9c5480f14fe425751335a5a76f17626