Import translations. DO NOT MERGE am: dfb6ca8235  -s ours am: b9ee1913a1  -s ours
am: 83fe32be06  -s ours

Change-Id: Ic951257c67c19234d4cb64a5043475a965acb2c1