[automerger skipped] Import translations. DO NOT MERGE
am: 148d370613 -s ours
am skip reason: subject contains skip directive

Change-Id: I47b0daf80c38e2043acf86010d71d8a4fa8c4667