Import translations. DO NOT MERGE am: 111f210309  -s ours am: 94374fc837  -s ours
am: 30349f374a  -s ours

Change-Id: Idb387458400fc098e86f5b2c26f126afa98f685d