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

Change-Id: I2e9909524a6e3e7169aba6d85832fac9a501a7b6