Import translations. DO NOT MERGE
am: 11b0c356f5  -s ours

Change-Id: Iccd8b8abae1af0e5b9ebb7dc5d8ebec57407e145