Import translations. DO NOT MERGE
am: 0694f446c1  -s ours

Change-Id: Id6bec84c01b8562202a11a14d3dc93a3a896d34f