Merge "Import translations. DO NOT MERGE" into oc-dev am: 03036e6316  -s ours
am: be6b10a507  -s ours

Change-Id: Ie788d41399ee05281304935085a80b4520547ed3