Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b  -s ours
am: 4ec78fa17b  -s ours

Change-Id: I859e5d2bbdc071565c6be82e8353e9bc18141c86