Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 64465df428  -s ours
am: cdb756273d  -s ours

Change-Id: I2b541eccb57f49daf56c6f35c7ae1f0eb1559552