Import translations. DO NOT MERGE am: 18a114896c  -s ours
am: d79cff78c7  -s ours

Change-Id: I9ec8e6ea539eb4b63173528f812f9b8fe97b409d