Import translations. DO NOT MERGE am: facc57619c  -s ours
am: d045d85bdd  -s ours

Change-Id: I2a58d5215b6fb32e1de3a78511429e5fa5016fff