Import translations. DO NOT MERGE am: e0fec63824  -s ours
am: 156955898f  -s ours

Change-Id: I5b5e2db47336ca156750b0f476dc1915b6743afa