Import translations. DO NOT MERGE am: 92d2dc9287  -s ours
am: 912bac0ff8  -s ours

Change-Id: Icb338cd8f6b95190bce52009720d5b2710b6426c