Import translations. DO NOT MERGE am: 251cbcbcc5  -s ours
am: a09c96c1a5  -s ours

Change-Id: If4cd48f7385e36f9473e171824e7fe96c63ab338