Merge "Import translations. DO NOT MERGE" into oc-dev am: 2758e3af09  -s ours am: 748d6e3404  -s ours
am: 6a8f482687  -s ours

Change-Id: I3b8f7192433c9c1aa0d9587e5b3af6743ebae598