Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 0b11f3e734  -s ours

Change-Id: I6c634c2a1c03cccbdab9dd841b5f7998619d3193