Import translations. DO NOT MERGE am: 7eeb016fdd
-s ours am: 4d83805999
-s ours
am: cacface139
-s ours
Change-Id: I24531365603dbf93fcfb07318d6de5e208b67cc1
This commit is contained in: