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

Change-Id: Ie67812c9c0c9347cc209fa6d68d8d38a3c3964c6