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

Change-Id: I71dd6c1227ed5900b99e4f25709e86c5a80d8313