[automerger skipped] Import translations. DO NOT MERGE am: 34e4c52950 -s ours am: b5c78cab58 -s ours
am: 2f78d74499 -s ours
am skip reason: subject contains skip directive

Change-Id: I72ed5a28a213a9be4089c868cbdbfd1078d68fc5