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

Change-Id: I7acaa0bdef39fc5c3d14b47ee63a1ce5da99c8ed