Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: b997ba1131  -s ours
am: dd3cefb4ef  -s ours

Change-Id: Icdb248ee431e45617072e2693ea509e4f81ecc88