Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3500677fec  -s ours
am: b08c9d4888  -s ours

Change-Id: I475ece67b842da097f368c09c62a561c533e7917