Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 04a65d2e70  -s ours
am: c2993798ed  -s ours

Change-Id: I2d6f2ab789110ed372c855f02e88d446f69a29bd