Import translations. DO NOT MERGE am: 8961beac16  -s ours
am: fd87141dcf  -s ours

Change-Id: I4eca2da033972328374dfbd1a18bf2b16f52a738