Import translations. DO NOT MERGE am: 7267438b58
-s ours am: 750540ae48
-s ours
am: a8d19dc2e4
-s ours
Change-Id: I86658e992835680c75c69cd869acb314d5b93c3e
This commit is contained in: