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

Change-Id: Ia01e35d5e40788ee8f2ee7c5042867916808c6c5