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

Change-Id: I7bcf2a9b523f994d03f340374cf9a065b8dd4408