am c8dcee0f: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c8dcee0fa8cede4fec399235f40eb76b41f01a6c':