Import translations. DO NOT MERGE am: b3a6a7afe4 -s ours am: 5be5a57151 -s ours
am: 044a1e6aca -s ours
Change-Id: Iec6a6ba863a09fb709968189ab6cc782e0ec6b11
This commit is contained in: