Import translations. DO NOT MERGE am: bad16bd66d  -s ours
am: f888275231  -s ours

Change-Id: Ica02d2123b900243fe34fe6addd15b4d5b92ca33