Import translations. DO NOT MERGE am: 6cdf1ade27  -s ours
am: 05793e1721  -s ours

Change-Id: I532f2f867d6c3120b1c5857eb84b00520d9b1ff3