[automerger skipped] Import translations. DO NOT MERGE
am: 0c8515698a -s ours
am skip reason: subject contains skip directive

Change-Id: I07e3b2f7815430d6086a109bd9fa38f54c02935c