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

Change-Id: Ie5059b38c3e176cb660f54eb406027a60ded0d01