[automerger skipped] Import translations. DO NOT MERGE am: 1308522cd5 -s ours
am: 5dfae2112f -s ours
am skip reason: subject contains skip directive

Change-Id: Ief995363bf6a0b2296cf68f4910faeb98f4806c1