[automerger skipped] Import translations. DO NOT MERGE am: 13611e7a26  -s ours
am: 36d1eed8fc  -s ours

Change-Id: Ia8943cea6e03d2fcaa4269b9f521fef105d3d856