Import translations. DO NOT MERGE am: ff06e7036c  -s ours
am: 03dede4b01  -s ours

Change-Id: I201b563a1f244ca886d9b72465c2df1a31f91500