Import translations. DO NOT MERGE am: 8a25fb603a
-s ours am: 9d7971905c
-s ours am: a2954b3232
-s ours
am: 2bfaa1856b
-s ours
Change-Id: I5d3f413bec8f870a61514c4da3f7f452dcf5c20f
This commit is contained in: