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

Change-Id: Ie6e16c83b85c9452255093992c3a3f7f94f6d850