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

Change-Id: Ib6d37a5058e4133459212c62ec87be420c0df991