Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6b4ac5d17b  -s ours
am: 2087bd6d3d  -s ours

Change-Id: I135c9e3563e42ffdb511744925a95ab23f44fdf6