Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: dd0a402e3f  -s ours
am: e4f37ae8f0  -s ours

Change-Id: Ic1559d91cb2ea18eae4dc77c00111916389adf3f