Import translations. DO NOT MERGE am: 1339fe799d -s ours am: 925c2bbcf6 -s ours
am: 9c6395a4f3 -s ours
Change-Id: Icf6a7fa1d8697f7acc023ea1be38add02f146852
This commit is contained in: