[automerger skipped] Import translations. DO NOT MERGE am: 0a8de9d763  -s ours
am: 9551717c69  -s ours

Change-Id: Ib0facfffd92a2a3ea1115b6da5eb65a8ad1d44e2