Merge "Import translations. DO NOT MERGE" into oc-dev am: 247911d184  -s ours
am: f6ee9682f8  -s ours

Change-Id: I6b30b9b74c217f07949bd6e5c88bab860321995a