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

Change-Id: I8c72e5a743d2d06c4839c02c5993e9cf6a5ef5eb