[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 skipped: 60f9184f36 am: 6501a185b9  -s ours am: 7dafb577cc  -s ours
am: 3b45644f85  -s ours

Change-Id: Ia6630bb3da5bc1e5687bb05b4091681673502357