[automerger skipped] Import translations. DO NOT MERGE am: c2a9c845df -s ours am: f2354d6ce6 -s ours

am skip reason: subject contains skip directive

Change-Id: I6c0a7a878e27739e3f5f6cf911e2a124b9823775