Import translations. DO NOT MERGE am: 97df95ca14  -s ours
am: 5bec8c451b  -s ours

Change-Id: I2af434f3f93953064551af9e7a75a862fff7bc84