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

Change-Id: I034e3f1a5916c01dc643cde92bd6f42187b5c480