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

Change-Id: Ie54c3d06873db3619f65f6e804554d587f367d92