Import translations. DO NOT MERGE am: 7d24dd6448 -s ours am: 1aa04e8cae -s ours
am: 70d5453b63 -s ours
Change-Id: Ide7da0fea22b8e7af33a4cecfa7b73264a65846b
This commit is contained in: