[automerger skipped] Import translations. DO NOT MERGE am: 3f0da867fe -s ours am: 9a65687a34 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife6ff55ca8dc85ce110c72e05fa2e589b5b28af4