Import translations. DO NOT MERGE am: b081f1e809  -s ours am: 43b03fbacf  -s ours
am: 7e3f20e249  -s ours

Change-Id: I81957a7142c7ee4f702e4895bdfebdb190750367