Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours am: 899f5cf309  -s ours
am: c260f7c6bb  -s ours

Change-Id: I930d8e7a4ad3f4fcea358235574b6698dede8772