Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: b599e2c8e2  -s ours
am: 53c4fb8ccb  -s ours

Change-Id: Id87aa6bc18e5490635bb402759eee7fe91a9f60f