Import translations. DO NOT MERGE am: d6c58b8976  -s ours
am: 715da6bc8f  -s ours

Change-Id: Ie0148bceeb59f49c5c2a366efc957a907a1e0319