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

Change-Id: Id9ba2b85e8435051754769a16994596dc9f391de