Import translations. DO NOT MERGE am: dccfc04a3e
-s ours am: ae35fa061e
-s ours
am: a69e26abbf
-s ours
Change-Id: If22270482cf8caffc0baa84e6205903e73f1f7fc
This commit is contained in: