Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours
am: 4666b50754
-s ours
Change-Id: I1aaca58936606507f763770e65dace147da5153a
This commit is contained in: