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

Change-Id: Iaf0d00c7ad3305749991f491e91f932ca64b3598