Import translations. DO NOT MERGE am: ffe930ec76
-s ours
am: 21b7e430e0
-s ours
* commit '21b7e430e0169d7b5a6f888c19ae37b1b503dec8':
Change-Id: I887f76c385a55621ba61f3621a81b86daea005b3
This commit is contained in: