Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 1f22b044bb  -s ours
am: c6a3a98e81  -s ours

Change-Id: I306f04db002071902e19bd53aecd3d281c97104a