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

Change-Id: I2cf52f36d90cb9852c5ade557c0d06ca18e041d5