Merge "Import translations. DO NOT MERGE" into oc-dev am: 2d1fb47916  -s ours
am: d5a6453cba  -s ours

Change-Id: I9bdae2592409be360b274dd45da6d3cfb61e6ab2