Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1d4e1aadbc  -s ours am: e052b904d3  -s ours
am: dcea1090b0  -s ours

Change-Id: I52adc98ff1f8f9669fcdaf8b62a469e3d63dfe6d