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

Change-Id: I70703a7e83de969b33a962243176d313bd21b04b