Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b8643b22c6  -s ours am: 9287820e6d  -s ours
am: 6715af85a0  -s ours

* commit '6715af85a058f4b9135e86f2fdada3ff4ca6485c':