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

Change-Id: I60730d3e81bc72197f5582d203134e1b61711435