Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: bf72a6345d  -s ours

Change-Id: I2a06cca43836530b7d02b77a577759aa673ec0e6