Import translations. DO NOT MERGE am: ef3044c46d  -s ours
am: 416e76c593  -s ours

Change-Id: Ife2fcc1ee593d877ee7944311149ba3479df1e80