[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours
am: 4065ce8773  -s ours

Change-Id: I2f05f7f47f5e7aed365bee09afc30b019cb73993