Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 0b11f3e734  -s ours
am: bb96135a7e  -s ours

Change-Id: I06e0dfc9305a6e44ed72224574e15b10f22b2885