Merge "Import translations. DO NOT MERGE" into oc-dev am: 2758e3af -s ours am: 748d6e34 -s ours am: 62aaa593 -s ours Change-Id: Iec5ad85b735408b928e0a282a6e7ec0e30a7e4af