Import translations. DO NOT MERGE am: 644a22437f -s ours am: 316c6df269 -s ours
am: ce37c7b14f -s ours
Change-Id: Ie696fc1f7d83b172e5859e9f82498882d5460d21
This commit is contained in: