Merge "Import translations. DO NOT MERGE" into oc-dev
am: 916b47f868  -s ours

Change-Id: If43291cc15cf7dd26eb7a87c0c22ed076ab0249c