[automerger skipped] Import translations. DO NOT MERGE am: c3bdde229b -s ours am: 593148d407 -s ours

am skip reason: subject contains skip directive

Change-Id: I55032332626131521aeb700c0bee4fcd5e6dd66c