Merge "Import translations. DO NOT MERGE" into oc-dev am: f1ec05297d  -s ours
am: d65e3e848a  -s ours

Change-Id: If7483545c49a9c4c08c44daab73a561246d20667