Import translations. DO NOT MERGE am: 2e617bd51d  -s ours am: 70afa060d3  -s ours
am: cde28884c0  -s ours

Change-Id: I35bffc0a254b8bf1999c696e2fffc8de93b27367