Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39  -s ours
am: cb562a40d9  -s ours

Change-Id: Iba2031a23c32e6ad748339ae7e2107bea8f80eb2