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

Change-Id: Ifaeaf651a92fd5bd261180f0aaa68bb2da521fc0