Import translations. DO NOT MERGE
am: 3bd78c2416  -s ours

Change-Id: I8838c95d0f6e688d70769939b2a4f5987fea5250