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

Change-Id: Ia729aedbc95c45bfad02fffb8704aaf9fd271f10