am dcf1904b: (-s ours) am 95199141: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'dcf1904b2e5716063e5b890ce94f0358ec761f07':