Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 31816f7464  -s ours
am: 84b645bc00  -s ours

Change-Id: Ica0e9c955dde80af0bf4fa680ec415bd04c17bc4