[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a  -s ours
am: 06e9f9dad5  -s ours

Change-Id: I87341fd783f4e18607921d0023c0a8d9bb2cdaf6