[automerger skipped] Import translations. DO NOT MERGE am: 31b31396cf -s ours
am: 9f4656b4d7 -s ours
am skip reason: subject contains skip directive

Change-Id: I233874a07f07a96df803ab0b0e50deb7f2b09215