Import translations. DO NOT MERGE am: 5a05a8a4ea
-s ours am: f131815859
-s ours
am: 6114c8d76d
-s ours
Change-Id: Ib0d7e5743af4d64ea147122bc5bb7c857e120dec
This commit is contained in: