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

Change-Id: I51f91698a0b05953339ebe8267e7d05887b3bd5c