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

Change-Id: Id97068ed1f5707fe8eeb29bf71ebc5e77015a217