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

am skip reason: subject contains skip directive

Change-Id: I8657a2486aa6e0a3bd248b54e888d0155ef2a593