Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d5a305068a  -s ours
am: 3d423a513d  -s ours

Change-Id: Ibd257f0e3a4379c5daff6d059a438b076a4f4b1a