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

Change-Id: I481f1ba311d3d020d789c33b8601886babe96b55