Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355  -s ours am: 5e1838a14e  -s ours
am: 47d1780be0  -s ours

Change-Id: I844b48110c247fc5bb1a316aa1468e59b4238ea8