Import translations. DO NOT MERGE am: 951b1616fc  -s ours
am: ffc4f0e83c  -s ours

Change-Id: I0607c22635ee2f90b368777562c407cfa58bb796