Import translations. DO NOT MERGE am: 251cbcbcc5  -s ours
am: 3d6acb722c  -s ours

Change-Id: I6504b98738a17e027a7fb77dbdbdce4b8fa8fa6a