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

Change-Id: Ifc2ec6aeb6f9447d697b3bdf78f1d3c167ab1697