Import translations. DO NOT MERGE am: a45b9aa91a -s ours am: 8abe6b3389 -s ours
am: 7ea0d0c7b2 -s ours
Change-Id: I60f6f719e15f883c311e56c14a38ef7e1c317820
This commit is contained in: