Import translations. DO NOT MERGE am: 66ff06da2f
-s ours am: c7ca1bcf70
-s ours
am: ff8eb394ad
-s ours
Change-Id: Ie0a016511f22afefa66f9b2a0a6687f88b8a310f
This commit is contained in: