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

Change-Id: Ib6582727556ea182a41cc966840c1366edeaa90a