Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad1 -s ours am: 0ad45f6f -s ours am: 101cf38a -s ours Change-Id: I58d52127fe0103931071c261742186e1d2ca70ab