[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb  -s ours am: 67f18d810a  -s ours am: d635022d93  -s ours am: 84729fca53  -s ours
am: 87829f5f24  -s ours

Change-Id: Ic012413a6e55e25133735406afc86c9d603db0b0