Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c610446  -s ours
am: b059f0bc3d  -s ours

Change-Id: I63dbf1618312c7a36b6d551bc4df29e24b8f9dff