Import translations. DO NOT MERGE am: d730a04ef7 -s ours am: db360b65d4 -s ours
am: 957c65fe13 -s ours
Change-Id: I771471e5f08471ff6c6a3f5c9c34d6d1428acd16
This commit is contained in: