Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 9b726f4387  -s ours
am: 9872a04b43  -s ours

Change-Id: I89444d629946c5d4b83bf866547a3e58f77faa8c