Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 52653734e3  -s ours

Change-Id: I7bb9c57df7c7723d48bd12432567ee97ba9295d8