Merge "Import translations. DO NOT MERGE am: 02799d57d7  -s ours am: 11d3b2db21  -s ours am: d789b8aac0  -s ours"