Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 98a98d4cb9  -s ours
am: c695304e37  -s ours

Change-Id: I7c79bf49a9d28da6e45df939dbe3408cdbdb976c