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

Change-Id: Id61b4a2da9551c8c084d7b5e71333105cbdfb225