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

Change-Id: I9b47b345f0682ab0b266e18d4a04243ed61fb226