[automerger skipped] Import translations. DO NOT MERGE am: 7a762b564f -s ours am: 82d7d3d88b -s ours
am: 1e4e7ccd35 -s ours
am skip reason: subject contains skip directive

Change-Id: I7ec174433b5bf82be42c79bc0e6287e50865b0b0